Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 22:09:25 +0000 (14:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 22:09:25 +0000 (14:09 -0800)

Trivial merge